From: Joakim Verona <joakim@verona.se>
Date: Tue, 13 Aug 2013 21:31:51 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=d9369d9a213a4c209ba572f84b788cf0b57247ed;p=emacs.git

merge from trunk
---

d9369d9a213a4c209ba572f84b788cf0b57247ed